WIP: Adding name prefix option