Changed particle names
Fixed Javadoc
Fixed test