Updated scoreboard API variable names

Updated scoreboard API variable names to be more suitable and removed
obselete code