Changed naming
Merge branch 'enCORE' of https://github.com/nlalex/MaxTech into enCORE