More consistent naming

push/pop for stack language
Fix namespacing