Naming & function fixes.