Added full name references to views