Trivial changes

Just a few trivial changes across several modules
identifiers starting with underscore followed by an uppercase char are reserved for the implementation (same for double underscore).