fixed naming conventions. What now, moritz?