Change naming conventions.