Merge pull request #48 from cgolubi1/infrastructure

more classname cleanup