generics & java reference rename fix