Changed a bunch of filenames
Updated to latest API syntax