Added support of Core's naming and friend renaming
Updated Core submodule