modify names to maintain consistency