Replaced calls to getSimpleName() with a getName() hook