Solve NamingConvention