Naming problems fixed