Renamed resources for clarity. Fixed some usernames.