Some more cleanup, pointing out now that php method names are case-insensitive