Update names to match convention