Fixing some naming issues