Various codestyle and naming fixes