Minor changes to method names for the sake of consistancy