Make sure naming-conventions are consistent