Fix naming scheme