Get correct name Fixes #4385