ref names have no namespaces

Change-Id: Ie6290bbaf2d2982520de33136c787f818e437de8
reference to non-existing defines

Change-Id: Iaa99b8ff6ffa85616c2db47f14682a653b156398
fix ref names

Change-Id: Iae8afadf78a54ec0938de487b78c9c3f14cdbcf8