Fix naming conventions

Fix #45