fix names + acl implementation part
Merge remote-tracking branch 'master/master'