Naming fixes, additional editor templates