Removed naming scheme