Move name related operations to separate sub modules