fixed errors related to convention changes / refactoring.