Move towards consistent naming scheme