Remove the shorthand entity name methods entirely