now uses a consistant nameing scheme