In order to agree with previous renaming these naming changes were made.