Fixed inconsistant naming shenanigans