Heavy bugfixes + adopting standard names.