Did some name refactoring on all scripts and some variable/method names to clear any ambiguity, further refactors coming soon..