First pass at renaming everything
few file names were still wrong. json file was never updated with custom metrics
Merge branch 'issue42_rebranding'