diff --git a/src/constants/BlockIDs.php b/src/constants/BlockIDs.php
index 9588dc587..1c5226731 100644
--- a/src/constants/BlockIDs.php
+++ b/src/constants/BlockIDs.php
@@ -19,177 +19,177 @@
  *
 */
 
-use PocketMine;
+namespace PocketMine;
 
-define("AIR", 0);
-define("STONE", 1);
-define("GRASS", 2);
-define("DIRT", 3);
-define("COBBLESTONE", 4);
-define("COBBLE", 4);
-define("PLANK", 5);
-define("PLANKS", 5);
-define("WOODEN_PLANK", 5);
-define("WOODEN_PLANKS", 5);
-define("SAPLING", 6);
-define("SAPLINGS", 6);
-define("BEDROCK", 7);
-define("WATER", 8);
-define("STILL_WATER", 9);
-define("LAVA", 10);
-define("STILL_LAVA", 11);
-define("SAND", 12);
-define("GRAVEL", 13);
-define("GOLD_ORE", 14);
-define("IRON_ORE", 15);
-define("COAL_ORE", 16);
-define("WOOD", 17);
-define("TRUNK", 17);
-define("LEAVES", 18);
-define("LEAVE", 18);
-define("SPONGE", 19);
-define("GLASS", 20);
-define("LAPIS_ORE", 21);
-define("LAPIS_BLOCK", 22);
+const AIR = 0;
+const STONE = 1;
+const GRASS = 2;
+const DIRT = 3;
+const COBBLESTONE = 4;
+const COBBLE = 4;
+const PLANK = 5;
+const PLANKS = 5;
+const WOODEN_PLANK = 5;
+const WOODEN_PLANKS = 5;
+const SAPLING = 6;
+const SAPLINGS = 6;
+const BEDROCK = 7;
+const WATER = 8;
+const STILL_WATER = 9;
+const LAVA = 10;
+const STILL_LAVA = 11;
+const SAND = 12;
+const GRAVEL = 13;
+const GOLD_ORE = 14;
+const IRON_ORE = 15;
+const COAL_ORE = 16;
+const WOOD = 17;
+const TRUNK = 17;
+const LEAVES = 18;
+const LEAVE = 18;
+const SPONGE = 19;
+const GLASS = 20;
+const LAPIS_ORE = 21;
+const LAPIS_BLOCK = 22;
 
-define("SANDSTONE", 24);
+const SANDSTONE = 24;
 
-define("BED_BLOCK", 26);
+const BED_BLOCK = 26;
 
 
-define("COBWEB", 30);
-define("TALL_GRASS", 31);
-define("BUSH", 32);
-define("DEAD_BUSH", 32);
-define("WOOL", 35);
-define("DANDELION", 37);
-define("ROSE", 38);
-define("CYAN_FLOWER", 38);
-define("BROWN_MUSHROOM", 39);
-define("RED_MUSHROOM", 40);
-define("GOLD_BLOCK", 41);
-define("IRON_BLOCK", 42);
-define("DOUBLE_SLAB", 43);
-define("DOUBLE_SLABS", 43);
-define("SLAB", 44);
-define("SLABS", 44);
-define("BRICKS", 45);
-define("BRICKS_BLOCK", 45);
-define("TNT", 46);
-define("BOOKSHELF", 47);
-define("MOSS_STONE", 48);
-define("MOSSY_STONE", 48);
-define("OBSIDIAN", 49);
-define("TORCH", 50);
-define("FIRE", 51);
+const COBWEB = 30;
+const TALL_GRASS = 31;
+const BUSH = 32;
+const DEAD_BUSH = 32;
+const WOOL = 35;
+const DANDELION = 37;
+const ROSE = 38;
+const CYAN_FLOWER = 38;
+const BROWN_MUSHROOM = 39;
+const RED_MUSHROOM = 40;
+const GOLD_BLOCK = 41;
+const IRON_BLOCK = 42;
+const DOUBLE_SLAB = 43;
+const DOUBLE_SLABS = 43;
+const SLAB = 44;
+const SLABS = 44;
+const BRICKS = 45;
+const BRICKS_BLOCK = 45;
+const TNT = 46;
+const BOOKSHELF = 47;
+const MOSS_STONE = 48;
+const MOSSY_STONE = 48;
+const OBSIDIAN = 49;
+const TORCH = 50;
+const FIRE = 51;
 
-define("WOOD_STAIRS", 53);
-define("WOODEN_STAIRS", 53);
-define("OAK_WOOD_STAIRS", 53);
-define("OAK_WOODEN_STAIRS", 53);
-define("CHEST", 54);
+const WOOD_STAIRS = 53;
+const WOODEN_STAIRS = 53;
+const OAK_WOOD_STAIRS = 53;
+const OAK_WOODEN_STAIRS = 53;
+const CHEST = 54;
 
-define("DIAMOND_ORE", 56);
-define("DIAMOND_BLOCK", 57);
-define("CRAFTING_TABLE", 58);
-define("WORKBENCH", 58);
-define("WHEAT_BLOCK", 59);
-define("FARMLAND", 60);
-define("FURNACE", 61);
-define("BURNING_FURNACE", 62);
-define("LIT_FURNACE", 62);
-define("SIGN_POST", 63);
-define("DOOR_BLOCK", 64);
-define("WOODEN_DOOR_BLOCK", 64);
-define("WOOD_DOOR_BLOCK", 64);
-define("LADDER", 65);
+const DIAMOND_ORE = 56;
+const DIAMOND_BLOCK = 57;
+const CRAFTING_TABLE = 58;
+const WORKBENCH = 58;
+const WHEAT_BLOCK = 59;
+const FARMLAND = 60;
+const FURNACE = 61;
+const BURNING_FURNACE = 62;
+const LIT_FURNACE = 62;
+const SIGN_POST = 63;
+const DOOR_BLOCK = 64;
+const WOODEN_DOOR_BLOCK = 64;
+const WOOD_DOOR_BLOCK = 64;
+const LADDER = 65;
 
-define("COBBLE_STAIRS", 67);
-define("COBBLESTONE_STAIRS", 67);
-define("WALL_SIGN", 68);
+const COBBLE_STAIRS = 67;
+const COBBLESTONE_STAIRS = 67;
+const WALL_SIGN = 68;
 
-define("IRON_DOOR_BLOCK", 71);
+const IRON_DOOR_BLOCK = 71;
 
-define("REDSTONE_ORE", 73);
-define("GLOWING_REDSTONE_ORE", 74);
-define("LIT_REDSTONE_ORE", 74);
+const REDSTONE_ORE = 73;
+const GLOWING_REDSTONE_ORE = 74;
+const LIT_REDSTONE_ORE = 74;
 
-define("SNOW", 78);
-define("SNOW_LAYER", 78);
-define("ICE", 79);
-define("SNOW_BLOCK", 80);
-define("CACTUS", 81);
-define("CLAY_BLOCK", 82);
-define("REEDS", 83);
-define("SUGARCANE_BLOCK", 83);
+const SNOW = 78;
+const SNOW_LAYER = 78;
+const ICE = 79;
+const SNOW_BLOCK = 80;
+const CACTUS = 81;
+const CLAY_BLOCK = 82;
+const REEDS = 83;
+const SUGARCANE_BLOCK = 83;
 
-define("FENCE", 85);
-define("PUMPKIN", 86);
-define("NETHERRACK", 87);
-define("SOUL_SAND", 88);
-define("GLOWSTONE", 89);
-define("GLOWSTONE_BLOCK", 89);
+const FENCE = 85;
+const PUMPKIN = 86;
+const NETHERRACK = 87;
+const SOUL_SAND = 88;
+const GLOWSTONE = 89;
+const GLOWSTONE_BLOCK = 89;
 
 
-define("LIT_PUMPKIN", 91);
-define("JACK_O_LANTERN", 91);
-define("CAKE_BLOCK", 92);
+const LIT_PUMPKIN = 91;
+const JACK_O_LANTERN = 91;
+const CAKE_BLOCK = 92;
 
-define("TRAPDOOR", 96);
+const TRAPDOOR = 96;
 
-define("STONE_BRICKS", 98);
-define("STONE_BRICK", 98);
+const STONE_BRICKS = 98;
+const STONE_BRICK = 98;
 
-define("IRON_BAR", 101);
-define("IRON_BARS", 101);
-define("GLASS_PANE", 102);
-define("GLASS_PANEL", 102);
-define("MELON_BLOCK", 103);
-define("PUMPKIN_STEM", 104);
-define("MELON_STEM", 105);
+const IRON_BAR = 101;
+const IRON_BARS = 101;
+const GLASS_PANE = 102;
+const GLASS_PANEL = 102;
+const MELON_BLOCK = 103;
+const PUMPKIN_STEM = 104;
+const MELON_STEM = 105;
 
-define("FENCE_GATE", 107);
-define("BRICK_STAIRS", 108);
-define("STONE_BRICK_STAIRS", 109);
+const FENCE_GATE = 107;
+const BRICK_STAIRS = 108;
+const STONE_BRICK_STAIRS = 109;
 
-define("NETHER_BRICKS", 112);
-define("NETHER_BRICK_BLOCK", 112);
+const NETHER_BRICKS = 112;
+const NETHER_BRICK_BLOCK = 112;
 
-define("NETHER_BRICKS_STAIRS", 114);
+const NETHER_BRICKS_STAIRS = 114;
 
-define("SANDSTONE_STAIRS", 128);
+const SANDSTONE_STAIRS = 128;
 
-define("SPRUCE_WOOD_STAIRS", 134);
-define("SPRUCE_WOODEN_STAIRS", 134);
-define("BIRCH_WOOD_STAIRS", 135);
-define("BIRCH_WOODEN_STAIRS", 135);
-define("JUNGLE_WOOD_STAIRS", 136);
-define("JUNGLE_WOODEN_STAIRS", 136);
+const SPRUCE_WOOD_STAIRS = 134;
+const SPRUCE_WOODEN_STAIRS = 134;
+const BIRCH_WOOD_STAIRS = 135;
+const BIRCH_WOODEN_STAIRS = 135;
+const JUNGLE_WOOD_STAIRS = 136;
+const JUNGLE_WOODEN_STAIRS = 136;
 
-define("COBBLE_WALL", 139);
-define("STONE_WALL", 139);
-define("COBBLESTONE_WALL", 139);
+const COBBLE_WALL = 139;
+const STONE_WALL = 139;
+const COBBLESTONE_WALL = 139;
 
-define("CARROT_BLOCK", 141);
-define("POTATO_BLOCK", 142);
+const CARROT_BLOCK = 141;
+const POTATO_BLOCK = 142;
 
-define("QUARTZ_BLOCK", 155);
-define("QUARTZ_STAIRS", 156);
-define("DOUBLE_WOOD_SLAB", 157);
-define("DOUBLE_WOODEN_SLAB", 157);
-define("DOUBLE_WOOD_SLABS", 157);
-define("DOUBLE_WOODEN_SLABS", 157);
-define("WOOD_SLAB", 158);
-define("WOODEN_SLAB", 158);
-define("WOOD_SLABS", 158);
-define("WOODEN_SLABS", 158);
+const QUARTZ_BLOCK = 155;
+const QUARTZ_STAIRS = 156;
+const DOUBLE_WOOD_SLAB = 157;
+const DOUBLE_WOODEN_SLAB = 157;
+const DOUBLE_WOOD_SLABS = 157;
+const DOUBLE_WOODEN_SLABS = 157;
+const WOOD_SLAB = 158;
+const WOODEN_SLAB = 158;
+const WOOD_SLABS = 158;
+const WOODEN_SLABS = 158;
 
-define("HAY_BALE", 170);
-define("CARPET", 171);
+const HAY_BALE = 170;
+const CARPET = 171;
 
-define("COAL_BLOCK", 173);
+const COAL_BLOCK = 173;
 
-define("BEETROOT_BLOCK", 244);
-define("STONECUTTER", 245);
-define("GLOWING_OBSIDIAN", 246);
-define("NETHER_REACTOR", 247);
+const BEETROOT_BLOCK = 244;
+const STONECUTTER = 245;
+const GLOWING_OBSIDIAN = 246;
+const NETHER_REACTOR = 247;
diff --git a/src/constants/GeneralConstants.php b/src/constants/GeneralConstants.php
index 5941b45b4..85ab8473a 100644
--- a/src/constants/GeneralConstants.php
+++ b/src/constants/GeneralConstants.php
@@ -19,52 +19,52 @@
  *
 */
 
-use PocketMine;
+namespace PocketMine;
 
 //Gamemodes
-define("SURVIVAL", 0);
-define("CREATIVE", 1);
-define("ADVENTURE", 2);
-define("VIEW", 3);
-define("VIEWER", 3);
+const SURVIVAL = 0;
+const CREATIVE = 1;
+const ADVENTURE = 2;
+const VIEW = 3;
+const VIEWER = 3;
 
 
 //Players
-define("PLAYER_MAX_QUEUE", 1024);
+const PLAYER_MAX_QUEUE = 1024;
 
-define("PLAYER_SURVIVAL_SLOTS", 36);
-define("PLAYER_CREATIVE_SLOTS", 112);
+const PLAYER_SURVIVAL_SLOTS = 36;
+const PLAYER_CREATIVE_SLOTS = 112;
 
 
 //Block Updates
-define("BLOCK_UPDATE_NORMAL", 1);
-define("BLOCK_UPDATE_RANDOM", 2);
-define("BLOCK_UPDATE_SCHEDULED", 3);
-define("BLOCK_UPDATE_WEAK", 4);
-define("BLOCK_UPDATE_TOUCH", 5);
+const BLOCK_UPDATE_NORMAL = 1;
+const BLOCK_UPDATE_RANDOM = 2;
+const BLOCK_UPDATE_SCHEDULED = 3;
+const BLOCK_UPDATE_WEAK = 4;
+const BLOCK_UPDATE_TOUCH = 5;
 
 
 //Entities
-define("ENTITY_PLAYER", 1);
+const ENTITY_PLAYER = 1;
 
-define("ENTITY_MOB", 2);
-	define("MOB_CHICKEN", 10);
-	define("MOB_COW", 11);
-	define("MOB_PIG", 12);
-	define("MOB_SHEEP", 13);
+const ENTITY_MOB = 2;
+	const MOB_CHICKEN = 10;
+	const MOB_COW = 11;
+	const MOB_PIG = 12;
+	const MOB_SHEEP = 13;
 
-	define("MOB_ZOMBIE", 32);
-	define("MOB_CREEPER", 33);
-	define("MOB_SKELETON", 34);
-	define("MOB_SPIDER", 35);
-	define("MOB_PIGMAN", 36);
+	const MOB_ZOMBIE = 32;
+	const MOB_CREEPER = 33;
+	const MOB_SKELETON = 34;
+	const MOB_SPIDER = 35;
+	const MOB_PIGMAN = 36;
 
-define("ENTITY_OBJECT", 3);
-	define("OBJECT_PRIMEDTNT", 65);
-	define("OBJECT_ARROW", 80);
-	define("OBJECT_PAINTING", 83);
+const ENTITY_OBJECT = 3;
+	const OBJECT_PRIMEDTNT = 65;
+	const OBJECT_ARROW = 80;
+	const OBJECT_PAINTING = 83;
 
-define("ENTITY_ITEM", 4);
+const ENTITY_ITEM = 4;
 
-define("ENTITY_FALLING", 5);
-	define("FALLING_SAND", 66);
+const ENTITY_FALLING = 5;
+	const FALLING_SAND = 66;
diff --git a/src/constants/ItemIDs.php b/src/constants/ItemIDs.php
index 9c0d3a648..649613821 100644
--- a/src/constants/ItemIDs.php
+++ b/src/constants/ItemIDs.php
@@ -19,151 +19,151 @@
  *
 */
 
-use PocketMine;
+namespace PocketMine;
 
-define("IRON_SHOVEL", 256);//Implemented
-define("IRON_PICKAXE", 257);//Implemented
-define("IRON_AXE", 258);//Implemented
-define("FLINT_STEEL", 259);
-define("FLINT_AND_STEEL", 259);
-define("APPLE", 260);//Implemented
-define("BOW", 261);
-define("ARROW", 262);
-define("COAL", 263);//Implemented
-define("DIAMOND", 264);//Implemented
-define("IRON_INGOT", 265);//Implemented
-define("GOLD_INGOT", 266);//Implemented
-define("IRON_SWORD", 267);
-define("WOODEN_SWORD", 268);//Implemented
-define("WOODEN_SHOVEL", 269);//Implemented
-define("WOODEN_PICKAXE", 270);//Implemented
-define("WOODEN_AXE", 271);//Implemented
-define("STONE_SWORD", 272);
-define("STONE_SHOVEL", 273);
-define("STONE_PICKAXE", 274);
-define("STONE_AXE", 275);
-define("DIAMOND_SWORD", 276);
-define("DIAMOND_SHOVEL", 277);
-define("DIAMOND_PICKAXE", 278);
-define("DIAMOND_AXE", 279);
-define("STICK", 280);//Implemented
-define("STICKS", 280);
-define("BOWL", 281);//Implemented
-define("MUSHROOM_STEW", 282);
-define("GOLD_SWORD", 283);
-define("GOLD_SHOVEL", 284);
-define("GOLD_PICKAXE", 285);
-define("GOLD_AXE", 286);
-define("GOLDEN_SWORD", 283);
-define("GOLDEN_SHOVEL", 284);
-define("GOLDEN_PICKAXE", 285);
-define("GOLDEN_AXE", 286);
-define("STRING", 287);
-define("FEATHER", 288);//Implemented
-define("GUNPOWDER", 289);
-define("WOODEN_HOE", 290);
-define("STONE_HOE", 291);
-define("IRON_HOE", 292);//Implemented
-define("DIAMOND_HOE", 293);
-define("GOLD_HOE", 294);
-define("GOLDEN_HOE", 294);
-define("SEEDS", 295);
-define("WHEAT_SEEDS", 295);
-define("WHEAT", 296);
-define("BREAD", 297);
-define("LEATHER_CAP", 298);
-define("LEATHER_TUNIC", 299);
-define("LEATHER_PANTS", 300);
-define("LEATHER_BOOTS", 301);
-define("CHAIN_HELMET", 302);
-define("CHAIN_CHESTPLATE", 303);
-define("CHAIN_LEGGINGS", 304);
-define("CHAIN_BOOTS", 305);
-define("IRON_HELMET", 306);
-define("IRON_CHESTPLATE", 307);
-define("IRON_LEGGINGS", 308);
-define("IRON_BOOTS", 309);
-define("DIAMOND_HELMET", 310);
-define("DIAMOND_CHESTPLATE", 311);
-define("DIAMOND_LEGGINGS", 312);
-define("DIAMOND_BOOTS", 313);
-define("GOLD_HELMET", 314);
-define("GOLD_CHESTPLATE", 315);
-define("GOLD_LEGGINGS", 316);
-define("GOLD_BOOTS", 317);
-define("FLINT", 318);
-define("RAW_PORKCHOP", 319);
-define("COOKED_PORKCHOP", 320);
-define("PAINTING", 321);
-define("GOLDEN_APPLE", 322);
-define("SIGN", 323);
-define("WOODEN_DOOR", 324);
-define("BUCKET", 325);
+const IRON_SHOVEL = 256;//Implemented
+const IRON_PICKAXE = 257;//Implemented
+const IRON_AXE = 258;//Implemented
+const FLINT_STEEL = 259;
+const FLINT_AND_STEEL = 259;
+const APPLE = 260;//Implemented
+const BOW = 261;
+const ARROW = 262;
+const COAL = 263;//Implemented
+const DIAMOND = 264;//Implemented
+const IRON_INGOT = 265;//Implemented
+const GOLD_INGOT = 266;//Implemented
+const IRON_SWORD = 267;
+const WOODEN_SWORD = 268;//Implemented
+const WOODEN_SHOVEL = 269;//Implemented
+const WOODEN_PICKAXE = 270;//Implemented
+const WOODEN_AXE = 271;//Implemented
+const STONE_SWORD = 272;
+const STONE_SHOVEL = 273;
+const STONE_PICKAXE = 274;
+const STONE_AXE = 275;
+const DIAMOND_SWORD = 276;
+const DIAMOND_SHOVEL = 277;
+const DIAMOND_PICKAXE = 278;
+const DIAMOND_AXE = 279;
+const STICK = 280;//Implemented
+const STICKS = 280;
+const BOWL = 281;//Implemented
+const MUSHROOM_STEW = 282;
+const GOLD_SWORD = 283;
+const GOLD_SHOVEL = 284;
+const GOLD_PICKAXE = 285;
+const GOLD_AXE = 286;
+const GOLDEN_SWORD = 283;
+const GOLDEN_SHOVEL = 284;
+const GOLDEN_PICKAXE = 285;
+const GOLDEN_AXE = 286;
+const STRING = 287;
+const FEATHER = 288;//Implemented
+const GUNPOWDER = 289;
+const WOODEN_HOE = 290;
+const STONE_HOE = 291;
+const IRON_HOE = 292;//Implemented
+const DIAMOND_HOE = 293;
+const GOLD_HOE = 294;
+const GOLDEN_HOE = 294;
+const SEEDS = 295;
+const WHEAT_SEEDS = 295;
+const WHEAT = 296;
+const BREAD = 297;
+const LEATHER_CAP = 298;
+const LEATHER_TUNIC = 299;
+const LEATHER_PANTS = 300;
+const LEATHER_BOOTS = 301;
+const CHAIN_HELMET = 302;
+const CHAIN_CHESTPLATE = 303;
+const CHAIN_LEGGINGS = 304;
+const CHAIN_BOOTS = 305;
+const IRON_HELMET = 306;
+const IRON_CHESTPLATE = 307;
+const IRON_LEGGINGS = 308;
+const IRON_BOOTS = 309;
+const DIAMOND_HELMET = 310;
+const DIAMOND_CHESTPLATE = 311;
+const DIAMOND_LEGGINGS = 312;
+const DIAMOND_BOOTS = 313;
+const GOLD_HELMET = 314;
+const GOLD_CHESTPLATE = 315;
+const GOLD_LEGGINGS = 316;
+const GOLD_BOOTS = 317;
+const FLINT = 318;
+const RAW_PORKCHOP = 319;
+const COOKED_PORKCHOP = 320;
+const PAINTING = 321;
+const GOLDEN_APPLE = 322;
+const SIGN = 323;
+const WOODEN_DOOR = 324;
+const BUCKET = 325;
 
-define("MINECART", 329);
+const MINECART = 329;
 
-define("IRON_DOOR", 330);
-define("REDSTONE", 331);
-define("REDSTONE_DUST", 331);
-define("SNOWBALL", 332);
+const IRON_DOOR = 330;
+const REDSTONE = 331;
+const REDSTONE_DUST = 331;
+const SNOWBALL = 332;
 
-define("LEATHER", 334);
+const LEATHER = 334;
 
-define("BRICK", 336);
-define("CLAY", 337);
-define("SUGARCANE", 338);
-define("SUGAR_CANE", 338);
-define("SUGAR_CANES", 338);
-define("PAPER", 339);
-define("BOOK", 340);
-define("SLIMEBALL", 341);
+const BRICK = 336;
+const CLAY = 337;
+const SUGARCANE = 338;
+const SUGAR_CANE = 338;
+const SUGAR_CANES = 338;
+const PAPER = 339;
+const BOOK = 340;
+const SLIMEBALL = 341;
 
-define("EGG", 344);
-define("COMPASS", 345);
+const EGG = 344;
+const COMPASS = 345;
 
-define("CLOCK", 347);
-define("GLOWSTONE_DUST", 348);
-//define("RAW_FISH", 349);
-//define("COOKED_FISH", 350);
-define("DYE", 351);
-define("BONE", 352);
-define("SUGAR", 353);
-define("CAKE", 354);
-define("BED", 355);
+const CLOCK = 347;
+const GLOWSTONE_DUST = 348;
+//const RAW_FISH = 349;
+//const COOKED_FISH = 350;
+const DYE = 351;
+const BONE = 352;
+const SUGAR = 353;
+const CAKE = 354;
+const BED = 355;
 
 
-//define("COOKIE", 357);
+//const COOKIE = 357;
 
 
-define("SHEARS", 359);
-define("MELON", 360);
-define("MELON_SLICE", 360);
-define("PUMPKIN_SEEDS", 361);
-define("MELON_SEEDS", 362);
-define("RAW_BEEF", 363);
-define("STEAK", 364);
-define("COOKED_BEEF", 364);
+const SHEARS = 359;
+const MELON = 360;
+const MELON_SLICE = 360;
+const PUMPKIN_SEEDS = 361;
+const MELON_SEEDS = 362;
+const RAW_BEEF = 363;
+const STEAK = 364;
+const COOKED_BEEF = 364;
 
-define("RAW_CHICKEN", 365);
-define("COOKED_CHICKEN", 366);
+const RAW_CHICKEN = 365;
+const COOKED_CHICKEN = 366;
 
-define("SPAWN_EGG", 383);
+const SPAWN_EGG = 383;
 
-define("CARROT", 391);
-define("CARROTS", 391);
-define("POTATO", 392);
-define("POTATOES", 392);//@shoghicp Why the heck do we need plural redundant Item ID here????
-define("BAKED_POTATO", 393);
-define("BAKED_POTATOES", 393);
+const CARROT = 391;
+const CARROTS = 391;
+const POTATO = 392;
+const POTATOES = 392;//@shoghicp Why the heck do we need plural redundant Item ID here????
+const BAKED_POTATO = 393;
+const BAKED_POTATOES = 393;
 
-define("PUMPKIN_PIE", 400);
+const PUMPKIN_PIE = 400;
 
-define("NETHER_BRICK", 405);
-define("QUARTZ", 406);
-define("NETHER_QUARTZ", 406);
+const NETHER_BRICK = 405;
+const QUARTZ = 406;
+const NETHER_QUARTZ = 406;
 
-define("CAMERA", 456);
-define("BEETROOT", 457);
-define("BEETROOT_SEEDS", 458);
-define("BEETROOT_SEED", 458);
-define("BEETROOT_SOUP", 459);
+const CAMERA = 456;
+const BEETROOT = 457;
+const BEETROOT_SEEDS = 458;
+const BEETROOT_SEED = 458;
+const BEETROOT_SOUP = 459;
diff --git a/src/entity/Ageable.php b/src/entity/Ageable.php
index 432d6a6da..9d2c8fa12 100644
--- a/src/entity/Ageable.php
+++ b/src/entity/Ageable.php
@@ -19,7 +19,7 @@
  *
 */
 
-namespace PocketMine\Entity
+namespace PocketMine\Entity;
 use PocketMine;
 
 interface Ageable{