Redo 64c0818 - Fix issue where the extended class name was fully qualified

My first implementation was wrong