Feature #5893 : renaming some interface and their implementations.