(Hopefully) fix object name -> description mapping resolution.