Remove maybe_ prefix from variables based on review comments.