Fixing to new naming conventions