Name refactoring.

AFDP-195