Ok some naming improvments