Couple more nHeight renames