Renaming library internal methods and updating all test files
Previous commit special "wip" stuff