Minor fixes to match the changes in the naming conventions