merging longname and filestring into name
removing unused functions
Authored by: ruckert 2009-09-08
Parent: [r195]
Child: [r197]