some refractoring

unified naming scheme