updating the variable names to be consistent
removed the functionality based on the clash which is not supported anymore
updating the variable names to be consistent
updating variable names to be consistent
renaming variables to be consistent
added a helper function, it will make sense in the next batch of changes
used the new setId()/getId() to get rid of the custom coding
updating the variable names to be the same across all the modules
updating the forms to use the method instead of the raw key
Merge remote-tracking branch 'upstream/master'