Updated some variable and package names according to a more proper 
convention.