Changed resource identifiers and state identifiers to match this application