Updated comment package names / codekit config