Renaming to match convention