Consistency, naming and layout improvements