Consistant naming with core