Fixed naming

tack-on to #36