More updates to the allocation interface

Use better names among other things.