Renaming for clarity and optional logging