Names and paths updates.

Signed-off-by: Norv <norv@simplemachines.org>