changed names to match convention