Rename manifest to fix class-lookup issue?

Change-Id: I5ed7b5e42b1239972688685b4069548510bbcf0c