JAL-1953 renaming of concrete implementation as well