Renamed test methods and file names to match the new api naming conventi...

...on