Change naming convention used