Unify identifiers
Add a workaround for unclosable #configure on iOS7
Merge branch 'fix-unclosable-configure-on-ios7'