Re-named and made codekit friendly