fix naming/case conventions