General code cleanup, change ap.getUsername() to ap.getName()