Changet the naming convention