Ensure to use canonical name constants