Improve the naming-conventions Chapter