correct errors after rebase

4 jobs for issue/cleanup_names_and_interface in 27 minutes and 58 seconds (queued for 3 minutes and 25 seconds)
Status Job ID Name Coverage
  Test
passed #6953
debian:10 clang-6-libcpp-17

00:21:02

passed #6952
debian:10 gcc-8-17

00:16:28

passed #6954
debian:9 gcc-6-14

00:13:33

passed #6955
ubuntu:18.04 clang-6-17

00:20:05