Merge pull request #133 from m4rc1e/ops

update name builders