Made naming scheme consistent