vhalbert and jrenaat Fix name by removing .json - cherry-picked from 62dc0d3