Fixing some naming