Replace some prominent occurances of GAE with App Engine