Get in sync with the android team on property names
Properly use the "setup" property