Fixed name capitalization and arguments