field renaming
Removed tname and fname from code