Naming fixes, lose ?> at EOF