Some naming conventions changed, some optimalizations