Re #1332 - Changing some method definitions to be consistant