There is a huge level of insanity in the hatch handling. Apparently
different parts of the code use different case of the hatch id which
makes it difficult to handle it.

Change-Id: I5674e21a6c9a2d01d7b641473e00ab5e2bcaffd4