Use gender neutral names

We have already switched John Doe to Jamie Doe, but we refer to Col as a he. Let's change this in gender neutral name Colby.