Update naming conventions + more Coffee
Again forgot to hide debug scenario