Starting to match naming conventions to Takua's standard