Added name and type class names

BECAUSE RUSS FORGOT TO