Updated Strings and names