Refactor specs

 Use fully qualified names

Change-Id: I740742cd1a87ef894c659e84c6b469db487a2f71