SFD-79

Adjusting method names.
SFD-26

Adjusting method names.