Refactored method names and deleted legacy files which caused namespace conflicts.