Fixed naming and compilation issues

I changed the atomIdentificationNumber name (too long) and fixed other
compilation errors with the combined code.