renamed all funny names to proper ones