Applied different naming convention