Remove keywords (*/+) from layer name for easier access. Closes #15