fixed some more problems resulting from new naming concept