Little renaming session for better clarity.