Refactored view names, columns names to use consisteny fully qualified name
Merging views