*8749* Fix access specs and var prefixes