renamed entity geo to world