First Name Change

Basic changes to get naming setup