Refactored arguments / method names according to terminology change
Refactored field names