Updated names to fit better within ccore naming scheme