Fix naming scheme; as per requested