Updated names. Relates to #1