Smart naming (42/48)

Smart naming