Fix several namcap errors

There are some new namcap errors. More info in the commit message.