Fix instance names and add project name to instance list

Change-Id: If68c57d26022e697b494e0af7ed86ee7247f4cf3