Improved reference type naming - still has issues