Drop -face suffix from js2 face names to match upstream