Swapped all variable/relation/view names to conventional naming scheme