Solving naming convention problems