Naming of #defines changed and general cleanup