Equalize naming scheme