Minor changes naming convention