Changed column name
variable names refactoring
Added converter beans.
Merge remote-tracking branch 'remotes/origin/master' into nomin
continuing with the mappings