Renaming to fit previous naming scheme.