Ordering and Naming fixes