NamingConvention simplification