Model|Resources: Cleanup (method name consistency)