FWK-19 : Rename "Base" into "Core"