Added enforcing a name in a enclosed scope