Fix underscore and replace with CamelCase

Fix #4