Re-organize ACP language

Prefix all ACP lang vars with ACP_ and organize them a little more