Made some minor changes to names