Name Overflowing

My name OF code got overwritten somewhere. Re-addresses #1815