Class name changes in accordance to Blueprint conventions