Added file names before class names on instantiations.