Multiple comment fixes
Rename ACP manager function