Smart naming (24/48)

Smart naming