Renames some GUI files to be more clear

Author: dbeckwith
Merge branch 'team9dev' into req3