Updated names to raw4j