Renamed files to match python/ros conventions