Smart naming (47/48)

Smart naming