Rename core/ items for more semantics