updating the variable names to be consistent
removed the functionality based on the clash which is not supported anymore