More type specs

Added more type information for records. Renaming different state
records.